<<<<<<< HEAD

from django.conf.urls import url
from .views import AcitivityListView,AcitivityDetailView
=======
from django.conf.urls import url

from activity.views import AcitivityListView, AcitivityDetailView
>>>>>>> c0e411a615cc06dcd36e049646153479c83a5e37

urlpatterns = [
    url(r'^activities/$', AcitivityListView.as_view()),
    url(r'^activities/(?P<pk>\d+)$', AcitivityDetailView.as_view()),
<<<<<<< HEAD
]
=======
]
>>>>>>> c0e411a615cc06dcd36e049646153479c83a5e37
